Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DataGrid] Refactor: move Badge to leaf import #15879

Merged
merged 5 commits into from
Dec 16, 2024

Conversation

romgrk
Copy link
Contributor

@romgrk romgrk commented Dec 14, 2024

Design-agnostic OKR.

Move Badge to a leaf import.

@romgrk romgrk added the component: data grid This is the name of the generic UI component, not the React module! label Dec 14, 2024
@mui-bot
Copy link

mui-bot commented Dec 14, 2024

Deploy preview: https://deploy-preview-15879--material-ui-x.netlify.app/

Generated by 🚫 dangerJS against c43b0c3

@romgrk romgrk requested a review from a team December 16, 2024 06:53
Copy link
Member

@michelengelen michelengelen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitty comment... nice improvement

@@ -131,6 +149,18 @@ export interface GridSlotProps {
toolbar: GridToolbarProps & ToolbarPropsOverrides;
}

/* Merge MUI types into base types to keep slotProps working. */
type Merge<A, B> = {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we define this in a more general (utils) space? This seems as if it could be useful elsewhere as well!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not used anywhere at the moment, I'd wait until it's used twice at least.

@github-actions github-actions bot added the PR: out-of-date The pull request has merge conflicts and can't be merged label Dec 16, 2024
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the PR: out-of-date The pull request has merge conflicts and can't be merged label Dec 16, 2024
@romgrk romgrk enabled auto-merge (squash) December 16, 2024 22:24
@romgrk romgrk merged commit fd31143 into mui:master Dec 16, 2024
16 checks passed
@romgrk romgrk deleted the refactor-agnostic-badge branch December 16, 2024 23:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component: data grid This is the name of the generic UI component, not the React module!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants